From 6c0683cfed74072ebae989d577d5fae65c5abb06 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 11 May 2012 17:05:06 +0300 Subject: [PATCH] Fix display when left-fringe/right-fringe display spec is invalid. src/xdisp.c (handle_single_display_spec): Return 1 for left-margin and right-margin display specs even if the spec is invalid or we are on a TTY, and thus unable to display on the fringes. That's because the text with the property will not be displayed anyway, so we need to signal to the caller that this is a "replacing" display spec. This fixes display when the spec is invalid or we are on a TTY. --- src/ChangeLog | 10 ++++++++++ src/xdisp.c | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ea67ee045d4..ff19dc0f03a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2012-05-11 Eli Zaretskii + + * xdisp.c (handle_single_display_spec): Return 1 for left-margin + and right-margin display specs even if the spec is invalid or we + are on a TTY, and thus unable to display on the fringes. That's + because the text with the property will not be displayed anyway, + so we need to signal to the caller that this is a "replacing" + display spec. This fixes display when the spec is invalid or we + are on a TTY. + 2012-05-09 Paul Eggert * unexaix.c (make_hdr): Fix typo in prototype. diff --git a/src/xdisp.c b/src/xdisp.c index cc75d386f0d..fd26853e09b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4681,10 +4681,10 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, if (!FRAME_WINDOW_P (it->f)) /* If we return here, POSITION has been advanced across the text with this property. */ - return 0; + return 1; } else if (!frame_window_p) - return 0; + return 1; #ifdef HAVE_WINDOW_SYSTEM value = XCAR (XCDR (spec)); @@ -4692,7 +4692,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, || !(fringe_bitmap = lookup_fringe_bitmap (value))) /* If we return here, POSITION has been advanced across the text with this property. */ - return 0; + return 1; if (it) { -- 2.30.2